From 20fa34b33b7578a3f08511f6287e68cd007d2810 Mon Sep 17 00:00:00 2001
From: "br260@laudney.cl.cam.ac.uk" <br260@laudney.cl.cam.ac.uk>
Date: Mon, 10 Nov 2003 16:36:15 +0000
Subject: [PATCH] bitkeeper revision 1.583 (3fafbe7fI5Lp1b80mt9IscwVvUn4nA)

Change Xen image name from 'image' to 'xen', 'image.gz' to 'xen.gz'.
Change XenoLinux image name from 'image' to 'xenolinux', 'image.gz' to 'xenolinux.gz'.
---
 BitKeeper/etc/logging_ok                        |  1 +
 xen/Makefile                                    |  4 ++--
 xen/Rules.mk                                    |  3 +--
 xenolinux-2.4.22-sparse/arch/xeno/Makefile      |  4 ++--
 xenolinux-2.4.22-sparse/arch/xeno/boot/Makefile | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index b66e37b978..673d59798e 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -6,6 +6,7 @@ akw27@labyrinth.cl.cam.ac.uk
 akw27@plucky.localdomain
 bd240@boulderdash.cl.cam.ac.uk
 bd240@labyrinth.cl.cam.ac.uk
+br260@laudney.cl.cam.ac.uk
 iap10@freefall.cl.cam.ac.uk
 iap10@labyrinth.cl.cam.ac.uk
 iap10@striker.cl.cam.ac.uk
diff --git a/xen/Makefile b/xen/Makefile
index f7d8c98cd8..742cf4561a 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -15,7 +15,7 @@ default: $(TARGET)
 	gzip -f -9 < $(TARGET) > $(TARGET).gz
 
 debug:	
-	objdump -D -S image >image.s
+	objdump -D -S $(TARGET) > $(TARGET).s
 
 install: $(TARGET)
 	gzip -f -9 < $(TARGET) > $(TARGET).gz
@@ -76,5 +76,5 @@ TAGS:
 	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a
 	find $(SUBDIRS) -name '*.[ch]' | xargs etags -a
 MAP:
-	nm image | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
+	nm $(TARGET) | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
 
diff --git a/xen/Rules.mk b/xen/Rules.mk
index 5864799e0d..a34a740f76 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -1,7 +1,6 @@
-
 ARCH    := i386
 
-TARGET  := $(BASEDIR)/image
+TARGET  := $(BASEDIR)/xen
 HDRS    := $(wildcard $(BASEDIR)/include/xeno/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/scsi/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h)
diff --git a/xenolinux-2.4.22-sparse/arch/xeno/Makefile b/xenolinux-2.4.22-sparse/arch/xeno/Makefile
index 9077bfb8a2..51a20235d2 100644
--- a/xenolinux-2.4.22-sparse/arch/xeno/Makefile
+++ b/xenolinux-2.4.22-sparse/arch/xeno/Makefile
@@ -93,11 +93,11 @@ FORCE: ;
 .PHONY: bzImage compressed clean archclean archmrproper archdep
 
 bzImage: vmlinux
-	@$(MAKEBOOT) image.gz
+	@$(MAKEBOOT) xenolinux.gz
 
 install: bzImage
 	mkdir -p ../install/boot
-	cp -a arch/$(ARCH)/boot/image.gz ../install/boot/xenolinux.gz
+	cp -a arch/$(ARCH)/boot/xenolinux.gz ../install/boot/xenolinux.gz
 
 archclean:
 	@$(MAKEBOOT) clean
diff --git a/xenolinux-2.4.22-sparse/arch/xeno/boot/Makefile b/xenolinux-2.4.22-sparse/arch/xeno/boot/Makefile
index 252daf50bf..290783cc62 100644
--- a/xenolinux-2.4.22-sparse/arch/xeno/boot/Makefile
+++ b/xenolinux-2.4.22-sparse/arch/xeno/boot/Makefile
@@ -2,21 +2,21 @@
 # arch/xeno/boot/Makefile
 #
 
-image.gz: image
+xenolinux.gz: xenolinux
 	gzip -f -9 < $< > $@
 
-image: $(TOPDIR)/vmlinux
+xenolinux: $(TOPDIR)/vmlinux
 	# Guest OS header -- first 8 bytes are identifier 'XenoGues'.
 	echo -e -n 'XenoGues' >$@ 
 	# Guest OS header -- next 4 bytes are load address (0xC0000000).
 	echo -e -n '\000\000\000\300' >>$@
-	$(OBJCOPY) $< image.body
+	$(OBJCOPY) $< xenolinux.body
 	# Guest OS header is immediately followed by raw OS image.
 	# Start address must be at byte 0.
-	cat image.body >>$@
-	rm -f image.body
+	cat xenolinux.body >>$@
+	rm -f xenolinux.body
 
 dep:
 
 clean:
-	rm -f image image.gz
+	rm -f xenolinux xenolinux.gz
\ No newline at end of file
-- 
2.30.2